changes in two, forcing merge conflict