small
merge
fixing javascript