Fixed indentation from stupid Git online editor
Fixed conflicts