user server clean up
applicant-test folder removed
applicant changed from appt to applicant
conflict resolved