> more potential conflicts between the trunk and the branch and makes
^^^^^^^^^^ branches> more potential conflicts between the trunk and the branch and makes
^^^^^^^^^^ branches