Removed merge errors

I have ensured all jshint tests are passing on Travis
Ensured no that there are no errors on the dev environement