Git merge
Git confuses me so much
git merge