Finally resolved merge issue, code is back at previous state
Merge branch 'original'