fixed configuration settings
fix merge conflicts