Fixed indention
Fixed merge conflict which was due to indentetion.