add help page
remove backup file
Merge conflict fix
Merge Fix