fixed all the stupid ass merge conflics.....