remove merge artifact

I should _really_ always compile before I push...