modify xor
resolve conflict