I added a comment to demnstate changeing a file
resolved conflict