updates
fixed merge conflicts