Squashed...with commit ammend
Force
Merge conflict