user week ticket
resole conflict