fix imports after merge conflict