merge drumans changes