Git Merge Force Incoming Flight