resolved merge conflict; several new or updated modules