Resolved merge conflict in make file
Resolved merge conflict in make file