Comment out verbose contents of Debug() method
Fix merge conflict