Have modified
Conflict resolved in level specs