modified view
Conflict resolved