Added python help file
Fixed merge conflict