update merge shape bug