fixed a merge failur on default message