Clearing conflic in hardware\ril

Signed-off-by: Daniel Bittencourt <danielcbit@gmail.com>