Added logging
Resolved merge conflicts