added a conflict