You know the changes
Merging conflicts