merge conflicts are fun