Finish adding Date
Clean up merchant