fix unfixed conflict