Fixed a merge error
Fixed a merge error

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