woops. didn't fully remove the merge conflict changes