add in some conflict stuff