GitButler now supports first class conflicts, making rebasing less annoying