Fixed stuff.
Fixed merge conflict.