yes check thi smerge conflict
Merge branch 'master' of https://github.com/studentpra/again.git

Conflicts:
	t.txt