Got rid of ugly merge conflict junk