merge conflicts are horrible things