changed js pyramid
merge conflict resolved js  pyramid