Teach me how to fix conflicts -_-
Indentation