update modal
fixed merge