agrega ignora para el target
Merge branch 'master' into dev