main function added
conflict
new feauture added