Fixed a merge conflict
Added @license tag to the comment header so it's preserved when uglified