Add MR conflict resolution tool.