fixed akun on Smktinistas
fixed conflic