git amend
Merge branch 'blue'