Adding git merge stuff