resolve conflict issues