Git Merge Conflict Example