hello_conflicts