Remove merge conflict accidentally committed to to_lunchplaces.yml