test conflicts again
resolve conflict