mysql docs added
conflict fixed