Fix merge
Merge
Fix location
Fix merge + location path