Conflict resolving test 2