all bugs fixed
fix merge bug
merge bug