fixed stacking problems
fixed merge conflict