changes to the branch before merge