modify file1@file4
modify file1 for conflict