merge indiestor and indiestor-core