Syncing changes before merging