Merge remote-tracking branch 'origin'
Merge branch 'master', remote-tracking branch 'origin' into target1
Edit text1 in maste.
Merge branch 'master' of https://github.com/klab-ou-h/Test
Edit text2 in target1.
Fix conflict in target1