added my name
fix conflict in fanclub list
fix lindays merge error