removed the files that were causing merge conflicts for the pull request