code merge and changes done