Fixed merging JS files