Fix conflicting keys