fixed the appendix
fixed conflict