Git Merge Force Commit