revise some files to fix incorrect merge