newfile for conflict

