Get some stuff working.
Fix non-existent conflict.