Also use types instead of equals() for versionmergestrategy branching