some settings modified.
conflicts resolved.