Add changes
Add second change
Fix merge conflict