Forgot to apply stash before last commit.
Removed debug statements.
Fixing merge conflicts