added conclusion
fixed conflict