Fixed conflictos de requirements