changed master branch
bug fixed
resoled merege coflict