conflict in terminal
debugged conflict