Resolve delimitMate and xmledit conflict