Indent issues resolved
Resolved merge conflict