javascript merge conflict
merge conficts fixed