Fixed things up for Chris, just cosmetic changes
trying to merge remotes