merging conflicts, getting sync'd up