Whoops, bad merge. Good catch!