Remove duplicate globals in jshint
Resolve merge conflict