menu conflic - resolved