blah blah
we had a conflict