Conflict test #2