test 2 add conflic