Fixed indentation
fixing merge conflict