Connection sucessful.
Resolve merge conflicts.