Fix more bugs.

Added debug output for conflicts while I'm here.