Minor changes.
Fixed conflict.