Initial commit
conflict resolution
section B C & partD