merge conflicts in emdx