solved conflict in config