no merging, they just show as sync conflicts