EOL wrongly updated indentation level
merge