resolve conflict, ver. 1.0