updates
fixed merge