all conflicts are solved. :-@