Fixed conflict with git merge