Added ff-only to pull and merge