remove even more problematic conflict code