Keyword: conflict resolution