Got rid of wretched identical duplicate code block that git conflict introduced

GRRRRRR damn you Git!