menu 2 conflict resolved