fix local conflict 2