added to appendix
fixed conflicts