Fix .mailmap

Author: SurFace81

.mailmap

@@ -7,9 +7,6 @@ Light summer <93428659+lightsummer233@users.noreply.github.com>
 123Duo3 <123duo3@gmail.com> <468673794@qq.com>
 Shayan <pxeemo@gmail.com>
 Shayan <pxeemo@gmail.com> <shayans31516@gmail.com>
-<<<<<<< HEAD
 Nicholas <programmergeo@gmail.com>
-=======
->>>>>>> 7691a86df4dc66f001811c9ad128e425fb025a67
 李太白 <36808766+ghhccghk@users.noreply.github.com> <2137610394@qq.com>
 Yuyuko1024 <dingwenxuan4@gmail.com> <38829308+Yuyuko1024@users.noreply.github.com>