File1 was modified on testing branch
master changed it
Merge branch 'testing'