Local commit 1
Local commit 2
Merge branch 'fix'