mysql repo added
conflict resolve