first attempt
mergeConflict