Removed debug git merge conflicts