join a tour conflict resolved