Foo
resolve conflict
resolve conflict