solve some conflict

hell yeah