conflict one bytestring fix

https://github.com/apache/airflow/commit/ece4c787d29673347b8e7cbb238d3ec83bd7f4a7