Maintenance/mergebranch

Multiple branches into one with all merge conflicts fixed