fixed a little corruption in the configuration when I tried to merge