What is the etymology of merchant?

There are two places this Word came from:

1. From the Anglo-Frank Word "marchaunt" meaning "shopkeeper."

2. From the Latin Word "mercatare" meaning "to trade"