Modified EditChapter before pull and merging
handled merge conflict with randomchoice