shared -> master
conflict fixed