I hate merge conflicts. I hate my life.