Fixed indentation
fixed merge