thesimplekid on Nostr: Good luck with the merge/rebase conflictsGood luck with the merge/rebase conflicts