fix conflict C-c C-c config