Fixed conflicting keys