Merge conflict resolved

Merge conflict resolved