2 ms·Yeah, I really want to solve merge conflicts on tickets.by mgaunard 3y agoYeah, I really want to solve merge conflicts on tickets.