simplifying rotation
fix up and down level
fix merge