Fixes in warehouse merge function