Update test 1

Test conflict resolution feature