fixed all merge conflicts