From my experience, there has never been any confusion about which country I am from when I tell a non US citizen that I am "American". I have also never, in actual conversation, heard somebody refer to the totality of western hemisphere landmasses as "America". It is always either North America or South America. The only exception I can think of in that regard is when discussing "The Americas" from the perspective of 15th and 16th century European exploration.