Fixed merging errors on master branch.