merge + update of webapp