solve some conflict