merge changes into dist