made changes to the first line
resolved conflict and merged with my first line changes