[Resolve] Use molinillo smart-backtracking branch