Adding Jerusalem as the default city
fix merge conflicts