change tabs to 2 spaces for js
merging