merge master and publish release