fixed merge conflicts.
Removed debug messages.