added solutions appendix
fixed conflict