merge & eliminate compile errors