fix conflcits