conflict test
conflict resolved
removed local configurations