merge --ff-only