Edit file1
Merge branch 'bugfix/issue1' into release/1.0