added appendix
fixed merge