resolving conflicts in corpus.create and reworking corpus.reshape