Update my own config.
Fix merging conflict.