code merge for js, css, config changes