Set preferred install as "dist" out of the box.
fix merge conflicts