Fixed botched merge

New to git... "merged?" commit was a flop