git close-branch allow ff merge
Merge branch 'allowff'