Get ready for merge oddness.
Uh?
Oddness.