Fix imports after merge conflicts