That's gonna be some fun; incoming, outgoing, and conflicts... #svn #merge