Create relation between actvity and places.
Solved merge conflicts.