Debug the compiled version for basic add task
Resolved merge conflicts