changed conflict to be able to be used