#362: Solving merge conflicts
#362: Create quick visit