exit test
merge
resolve conflict