add try catch to restaurant location
fix merge conflict