Before removing
Conflict resolved