initial source
resolve conflict