readme update
readme update / fixed conflicts