Resolve merge conflicts with apache_hive/ptf-windowing