removing conflict markers
Merge branch 'chapter4_to_6'