removing stupid conflict junk, git is stupid right now