fix local conflict