common: pulse2-setup - previus commit conflict fix