change line7
change line1
change line3
Revert "change line3"

This reverts commit 3efca10e73a64b6c8f0eab96cdfd803709b79a98.
change line3
Merge branch 'version2' into version1