resolving merge conflicts in contrib json. 

resolving merge conflicts in contrib json.