first commit
fixed conflicts in README