To retrieve the information about the number of conflicts, a merge now returns the number of conflicted files instead of a Status object.
Status
No changes between version 1 and version 1
