Some BS changes.
Fixed merge conflict.