removed the conflicts from the two files