change conflict comparison logic