Git: fix merging errors