Some tweaks.
Fixed conflict.