Fix merge error
Fix merge error

heartfelt-fancy/KanColleViewer,gakada/KanColleViewer,bllue78/KanColleViewer,gakada/KanColleViewer,yuyuvn/KanColleViewer,BossaGroove/KanColleViewer,KatoriKai/KanColleViewer,AnnaKutou/KanColleViewer,Astrologers/KanColleViewer,kookxiang/KanColleViewer,gakada/KanColleViewer