third branch change
second branch change
new branch changes
fixing merge
fixing second_branch conflicts
fixing conflicts
 new commit for exercise 2