Improve crumpd merge