Merge clean into dist