Git Merge Command Stack Overflow