Fix duplicate control keys in the manifest