fix visiting
merge