now
resolved conflict in file2