More changes to the branch code to cause conflicts