corrections for conflict

repositioning of menu to resolve conflict