conflicts in doc resolved manually