updated readme & model
fixed conflict readme