removed some conflict stuff