expected <eof> got end?

I tried making a timer script...

if timertime == timerdefault then
	repeat timertime = timertime - 1
	text = timertime
	wait(1)	
	until
	timertime == 0 and text == 0
elseif mappicked == true then
	repeat timertime = timertime - 1
	text = timertime
	wait(1)	
	until
	timertime == 0 and text == 0
	end
end

and the last end says expected , got 'end' Help please?

You have an extra end on line 13. Until is the end for a repeat loop, you do not need another one.

if timertime == timerdefault then
    repeat timertime = timertime - 1
    text = timertime
    wait(1) 
    until
    timertime == 0 and text == 0
elseif mappicked == true then
    repeat timertime = timertime - 1
    text = timertime
    wait(1) 
    until
    timertime == 0 and text == 0
end