resolve conflicts
depricated