changed restauraunts and merged conflicts