added details
fixed conflict