Removed echos
Conflict resolved