resolved conflict between server and local
coffeescript file