actually fixed all merge conflicts