misc changes.
Fixed merge conflict