Thread:Gsimenas/@comment-26391060-20141129154201/@comment-6697950-20141129155038

By conflict, do you mean that the JP terms don't match or do you mean that we'll have two identically named skills on the wiki?