HIVE-8535: resolve conflicts