made redirect almost work
merge error fix