Update .xxdiffrc from Conception.
Finish merging stuff with new Conception.