merge feedback and om