mxjki Conflicts solved