More commented out bad code.

Still more merge conflicts.