lo hice en la rama que no era
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/spai/egit2/test/NumeroEnteroTest.java
Merge branch 'master' into develop
Merge branch 'master' into develop