Создали first_r Add text Added text through browser Added local txt Added txt in new branch Creating conflict Resolving conflict