SourceTree changes.
Resolve merge.
Completing merge.