initial
fixed conflicts in README