Fix conflict

In the next commit
Fix bugs:
- indent of if, else, for without "{"