NXP-10119: implement a test basic conflict resolution