Remove the forgotten conflict mark
Remove the forgotten conflict mark

wagnerluis1982/speakerfight,mauricioabreu/speakerfight,luanfonceca/speakerfight,luanfonceca/speakerfight,mauricioabreu/speakerfight,wagnerluis1982/speakerfight,mauricioabreu/speakerfight,luanfonceca/speakerfight,wagnerluis1982/speakerfight