Git Merge Force All Star