changes made as part of last merge conflict