new dist
fixed merge conflicts