merge changes from mapjs