clear up some conflict errors