merged dist to master