location on phone working
merge conflict