Fixing a common problem with a Git Merge

Please enter a commit message to explain why this merge is necessary