merging to master and cleaning up branches