Location working
fix conflict