undo bug fix
dist
merge