js novvie function
merge conflict fix