Solving merge issues (JS replaced with Coffee)