v5: resolve conflict.