Fixed indentation issue after merge