also change on file 2
resolved conflict