Fix merge conflict.

Use package loading placement from master.