Resolve more merge conflicts
Resolve more merge conflicts

elliotaplant/Bolt,elliotaplant/Bolt,boisterousSplash/Bolt,gm758/Bolt,gm758/Bolt,boisterousSplash/Bolt,thomasRhoffmann/Bolt,thomasRhoffmann/Bolt