conflicts removed in menu