Conflict b/w assessment and new_branch_name