fgh
ghf
hjhjhj
ghghgh
Merge branch 'test'

Conflicts:
	Новый текстовый документ.txt
l;kjh
fgh
ghf
hjhjhj
hg
nb
Merge branch 'master' of https://github.com/namelesstwice/test
Merge branch 'new-feature'