I also found solving conflicts fun for the first time! Absolutely love using GitDuck with my cofounder.