simulation: This commit is for making conflict contents

Bla~
Merge remote-tracking branch 'remotes/origin/featureA'

Conflicts:
	a.txt