diff --git a/www/states/MainMenu.js b/www/states/MainMenu.js
index 90a4eab2eaaad48ce5885e161f02a2fe69531356..6ccfe5f455c51f554f06944a8bb72f2014ee0063 100644
--- a/www/states/MainMenu.js
+++ b/www/states/MainMenu.js
@@ -22,13 +22,11 @@ MainMenu.prototype = {
 	create: function() {
 		game.state.add('mapState', mapState);
 
-<<<<<<< HEAD
-		//musica do menu		
+
+		//musica do menu
 		musicaMenu = game.add.audio('musicaMenu');
 		musicaMenu.play();
 
-=======
->>>>>>> AtividadeQuebraCabeca
 		background = game.add.sprite(0, 0, 'background');
 		background.width = game.width;
 		background.height = game.height;
diff --git a/www/states/mapState.js b/www/states/mapState.js
index 1e142ba3a0cdf42c627d3d065e34cd94989f1afd..a4b08df7574f2cea25c4bb71e8d7e8355f087e3b 100644
--- a/www/states/mapState.js
+++ b/www/states/mapState.js
@@ -34,13 +34,9 @@ mapState.prototype = {
 		ocean = game.add.sprite(0, 0, 'ocean');
 		ocean.width = game.width;
 		ocean.height = game.height;
-<<<<<<< HEAD
-
-		//som do oceano		
+		//som do oceano
 		somOceano = game.add.audio('somOceano');
 		somOceano.play();
-=======
->>>>>>> AtividadeQuebraCabeca
 
 		ilhaTerror = game.add.sprite(W/5, H/5, 'ilhaTerror');
 		ilhaTerror.animations.add('ilhaTBrilha', [2, 3, 2, 3, 2, 3, 2, 0], 7, false);
@@ -97,7 +93,7 @@ mapState.prototype = {
 			if (recebedor == null) //Chamar animacao transicao de cena
 				recebedor = setTimeout("this.dispose; game.state.start('AtividadeMascara'); clearTimeout(recebedor); recebedor = null", 250);
         }
-        
+
         //Se Chegou NA ILHA RED
         else if (this.verificaIntersects(boat, islandRed) && notTouching[1])
         {
@@ -106,14 +102,14 @@ mapState.prototype = {
            	if (recebedor == null) //Chamar animacao transicao de cena
 				recebedor = setTimeout("this.dispose; game.state.start('AtividadeQuebraCabeca'); clearTimeout(recebedor); recebedor = null", 250);
         }
-        
+
         //Se Chegou NA ILHA Yello
         else if (this.verificaIntersects(boat, islandYellow) && notTouching[2])
         {
            	boat.body.velocity.setTo(0, 0);
            	notTouching[2] = false;
         }
-        
+
         //Se Chegou NA ILHA Arco
         else if (this.verificaIntersects(boat, ilhaArco) && notTouching[3])
         {