Resolved merge conflict
Removed address book controller and made some minor changes