Merge of sync conflict