add a new file prace.txt
ss
ss
Merge branch 'dev'
master
s
sd
sd
sd
s
bug
Merge branch 'bug'

Conflicts:
	ss.txt
sdf
Merge branch 'dev'
ss