Git Merge Force Conflict