changed implementation chapter
fixed conflict