Talk:Just Dance Now (Chinese Version)/@comment-25580039-20160825034218/@comment-26699584-20160825034448

@Sato Add the Conflict template first because I was gonna do it but then you did.