#16 Create new mixin to merge a branch, use that in various places and ensure composer packages to always merge in the release stage