Merge local repository from hackathon