conflict leftover?