Send and receive
FixMergeConflicts