New location -activity added
Resolved conflicts