String (GitRepository repository) { conflict(repository, BRANCH_FOR_UNMERGED_CONFLICTS, "unmerged.txt"); git(repository, "merge " + BRANCH_FOR_UNMERGED_CONFLICTS, true); return git(repository, "branch -D " + BRANCH_FOR_UNMERGED_CONFLICTS); }