added testing chapter
fixed conflict