Modified branch completion merge with --no-ff
Modified branch abandonment with correct strategy