clean up distro
fix merge conflict