fix(pumpkin-core): Declare solving after conflict resolution#317

maartenflippo merged 1 commit intomainConSol-Lab/Pumpkin:mainfrom

fix/no-learning-resolverConSol-Lab/Pumpkin:fix/no-learning-resolverCopy head branch name to clipboard