fixed config file
fixed conflicts