Clean up invalid indentation from merge
1 file changed