JBTM-1691 Don't attempt to auto merge the conflicts (master)