hacking around the js to get this to work
Merge remote-tracking branch 'origin/master'