fixed random merge issue