sis e guardan
resolved score.txt conflicts