one small bug fixed
after conflit fixed