Readme fix

removed "<<<<< HEAD" from readme