Resolve conflict.