Update e Instalacao do CanCan
solução do erro fatal: You have not concluded your merge (MERGE_HEAD exists).