changed coffeescript to js
javascript :(
resolve non-existant conflicts