now with cscope
merge