merging
fixed more merge missings