Conflict resolved

Conflict resolved