conflict-resolution Merge conflict test This is a remote change. This line was added locally. This line was not added in the new_merge_changes branch