fixed bucket
undo feature
merge