test conflicts
conflict test
Merge branch 'test'

Conflicts:
	practice_1/vladimir.py
r-solved