fix indentation error from merge