Fixed merge conflict
Merge branch 'sbengali-master'