Add component mergeConflictPanel