resolve conflict source