merge confirct edit mixx