Запрос на слияние 'dev' (#3) из dev в master

main data after fixes

Merge branch 'dev' of https://gitverse.ru/Ladann/conflict_tutorial into dev

new dev fixes 1

update main_data.txt

main data after fixes

resolve data conflict

main_fixes

Merge branch 'dev' of https://gitverse.ru/Ladann/conflict_tutorial into dev

new dev fixes 1

update main_data.txt

update main_data.txt

new dev fixes

resolve data conflict

dev_fixed

main_fixes

dev_fixed

Initial commit