fuck
delete a file
add a new file - x.txt
change x.txt
bug fixed
Merge branch 'testing'

Conflicts:
	x.txt