back to tour button
fixed merge conflict