several addtions
conflict resolved