second conflict
second conflict resolution