Location added, still not working
Conflicts fixed