load: merge conflicts