logger.info("Naming conflict found");
<BUG>processRenameConflict(conflict, context, model);
</BUG>
} else if (isContentConflict(conflict)) {
logger.info("Content conflict found");
<BUG>processContentConflict(context, model, contentTriplet, localPath);
</BUG>
} else {
logger.error("Unknown conflict state");
}

logger.info("Naming conflict found");
processRenameConflict(conflict, context, model, nameMergerResolution);
} else if (isContentConflict(conflict)) {
logger.info("Content conflict found");
processContentConflict(context, model, contentTriplet, localPath, nameMergerResolution);
} else {
logger.error("Unknown conflict state");
