fixed some major merge conflicts