add merchant entity and controller