change-file detached head

Change-Id: Ic5105ee821e1b584c827ffd185cf87e7456fcff0
Merge branch 'amend1'

Conflicts:
	change-file(resolved)

Change-Id: I423b4db0dbbe59f4b8495d17ee1be90a57549a1f