update janitor
update pepita
fix ie merge issue