fixed merge errors
fixed code indentation