Fixed imports after merge