Merge "Modify the indentation problem for the if loop"