Fixed fucking kcaptcha
Fixed conflicts