auto mode added
modified README.md
fixed conflict