fix:pull conflict

Author: chaoyen1111

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2022.11.1
+
 ### Fixed
 
 - 平板或手機旋轉後，刷新萬用遙控器
@@ -14,7 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 
-- meta 修改
+- meta 修改 
 
 ## 2022.2.25