fixed the branch

In a perfect world, git automatically merges things