Fixed indentation
Added merge sort