removed check for config file
fixed conflicts