my changes to puma and nginx configs to merge in