fix indentation issue from merge