oops fix merge conf in settings