Some changes
Conflict resolved