merge the conflicts