Removed error conflict.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
Merge pull request #934 from anilgooru/master

Removed error conflict.