Removed ding path alias form make file
Resolved merge conflict in make file