<@U092308M7> You'd get merge conflicts either way
# random
r
@orangy You'd get merge conflicts either way