update inittab module, recombining the branches