self-merge

Because derp.