VCS API moved conflictResolved/2 to MergeSession as it needs status data that is...