JDA and RedPrairie to merge