Deploy
Merge
Fixed dist