Removing debug files
Fixing merge conflicts