added sematic js
merge conflict resolution