player participation creation listo
arreglando conflictos de commit