fixed few conflict warnings