That oneness is samadhi — and that is the difference between satori and samadhi. Satori is getting in harmony within yourself, that is the first step; samadhi is getting in harmony with the total, that is the last step. In satori your conflict disappears; in SAMADHI you also disappear.