Removed git merge ff-only