Modify conflict-file in master.

Change-Id: I448bf3b2558cd35b35bbd4f4b55ebcedf0e92118
Create rebase-file in master

Change-Id: I7023644751af59fd19da8a463da2122ba3a9508c
Modify conflict-file in r1

Change-Id: I3f530a1ba0f5fc40088ceb63e31a091dd919483e
Create rebase-file in r1

Change-Id: I3e5d1c2c6abefc61b691fd42b521fa847e062a77
Merge branch 'master' of https://github.com/vmihellhale/the_grand_high_repo

Conflicts:
	conflict-file

Change-Id: I6b2dd238def382d8f316395c8c8f972d5847eba9