Ugh, bad merge, again