Git Merge Force Incoming Changes