array based tests
resolve conflicts