Small changes. Figuring out how the branch merging works.