tour with markers
edited conflict