Corrected false integration
Resolved merge conflict