Fixed weird javascript bug
Fixed merge conflict