removing duplication+conflict

Change-Id: I0ae4d9c473ddc3a75f82fd2d0882002ed1db1463
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>