messed up readme
fixed conflicts