hopefully actually adding a conflict