Cabalar test
resolve conflict