merge current js into dev