fixed module merge issues