Fix bad merge, improve logging, and require cfg.inc