Fixed idention
Resolved merge conflict