branch error merge