fix local conflicts