So I created a new branch from master and eventually merge the changes back, only some changes seemed to merge and it would seem I merged in one direction. Eventually I just decided to be sure master received all the 'experimental' changes then I deleted the experimental branch and made a new one. So this question is turning into a few questions suddenly:
1) How do I match up branches but keep them separate?
1a) Is that bad practice to not just make a new branch?
2) Why were the branches not the same after after one merge?
2a) Am I only supposed to call a merge on the one that I want to have all of the changes?