structural changeo
fixed merge