modified in branch
before switch
commit for fixindexfile
finish work on testing branch
solve the confilic
add testing...