Fixes for errors after conflict resolution. Refs #6677