Fix merge conflict in js assets