Updated conflicts

Updated the conflicts that existed in the previous pull request.