Fix merge weirdness. *sigh*