Merge problems solved (only imports)