revert some files after merge