modify the conflict with HiveQl