changed the first line of file
modified first line and resolved conflict