merge
fix active locations