fixed some conflict