adding commit in branch testing1
made other changes
added new issue 53 fix
add hot fix
solve conflict
solve conflict for testing1