Apply js-beautify
Corrected merge