nostr:npub1ufmlneg8tt9jwvk6p40t02lxhmkns6zlpu4cwrvxerczdnn4syzqlgqhp4 Yeah, seasoned git users are pretty much dealing with merge conflicts on a regular basis, quite like how I sometimes end up hand-editing patch files.