Merging in CoffeeScript article via squash