take notes on merging CX fixes