Added 'each'
Resolved merge conflict