db revised
conflict fixed