wrote in text.txt [issue1 branch]
added the hotfix
added text after hotfix was merged and deleted
post-conflict commit