Edit text2 at home.
Edit text1 at home in hotfix.
Edit text1 in branch8.
Restore confict.