Git Merge Doesnt Make Sense