finish merging missed some issues