edited readme
fixed conflicts