a few updates
merge conflict resolve