correct the mess in upmerge logic
update modules