cleaned up the merge conflict crap