cleanup merged config handling