updates
fixed merge conflict