update merge of rs.js #697