rename conflict#model to conflict#model_configuration, add docs to conflict and change_set
add docs for log and last_log