final modification to file_conflict
resolved conflict