pushing jayz's changes because there was a remote and a branch and nothing made sense so i just manually put it in which was ultimately the quickest way
merged conflict