Regulator seeks to merge, simplify rules across cash, derivatives and commodities