Cleaned dist to avoid merge conflicts