Fix indent error from merge