edit file1, add file3
merge feature