resolve conflict manually