contacts changes
contacts changes and conflict