refactor week ticket user
resole conflict