Fix conflicts with master
Fix conflicts with master

sreekantch/JellyFish,boozallen/projectjellyfish,projectjellyfish/api,adderall/api,sonejah21/api,stackus/api,sreekantch/JellyFish,boozallen/projectjellyfish,sreekantch/JellyFish,dcallner/project-jellyfish-api,adderall/api,sonejah21/api,boozallen/projectjellyfish,stackus/api,AllenBW/api,projectjellyfish/api,projectjellyfish/api,dcallner/project-jellyfish-api,AllenBW/api,adderall/api,sonejah21/api,AllenBW/api,dcallner/project-jellyfish-api,stackus/api,mafernando/api,boozallen/projectjellyfish,mafernando/api,mafernando/api