second merge commit
Fixing merge conflict