Merging remote with local branch, messed up a git command