add user to userto when jumping in + solved bundle conflicts