Using branch -D when removing branch after finish
Removed merge --no-ff when merging after finish