fix dist from merge conflicts