js merge conflict fixed.