Edit file1
Merge branch 'bugfix/issue1'