Started on ConnectionManager.
Resolved conflicts.