fix runtime merge conflicts, update script