Fixed some merge conflicts and removed debug.logs