Ugh, didn't see that merge conflict in there still.