fixed merge error on ETL