Fixed a merging issue

Fixed a conflict that came as a result of merging various pull requests.