forked line
updated merge conflict
changed in errors doc
reupdated errors doc
solution for new error
Merge pull request #1 from rohitvernekar/topic

merged rohitvernekar/topic