Update newfile
resolved a conflict