merging issues
three more merge fixes
two more merge issues
 one more to go
ready to work again