there was a conflict after all