fix bugs in merge
clean files