Additional menu

tool for conflict resolution