update hotbuild (bugfix conflict autofactory)