fixed some conflict stuff