learning-about-version-control Shell Ou <<<<<<< HEAD Solving merge conflicts takes conscious effort, but I can do it! It's cool It's a little complicated Solving merge conflicts is easy! fd6d3e91277cceaf2384bee1bae902a6d8603602