|marjorie|minor modifications|
|marjorie|conflicts solved|