Added missing changes
Results after git merge conflict