Commit for bug fixes

Commit for bug fixes
Conflict resolved

Conflict resolved