fix indentation issue after merge with master