Html changed
Coordinates tracking
Conflict resolved