cambio en mi feature
asd
asd
nuevafeat 1
nuevafeat2
Merge branch 'feature/nuevafeat' into develop
blablah fin de feature
Merge branch 'feature/otraFeature' into develop

Conflicts:
	fichero1.txt