updates
fixed merge errors