add a diff line in test_branch
fix the conflict