[vadymkovalchuk-04] update conflict
Merge remote-tracking branch 'origin/vadymkovalchuk-01-add-my-file' into vadymkovalchuk-01-add-my-file

Conflicts:
	vadymkovalchuk.txt