Fiksa captcha
fixed merge conflict