fix small bug
fixed conflit