merge: release strbuf after use in suggest_conflicts()