bug fix in master
removing conflict in index file
I am finishing my code in index