Fixed build
Resolved merge conflicts