Remerged conflict files