rm config for hadoop
conflict fixed