Git Merge Force All Users