Git Merge Force All Client Generated