trying to fix all merge conflicts