Fix merge indentation issue