Test change
Quick commit
wtf
Added again D
Added sensitive change
New stable feature
Another sensitive change
Merge branch 'testing'
comitting that yes
commiting that no
Merge branch 'test'

Conflicts:
	fileD
aaa