Import BaseRelayRecipient.sol and OpenZeppelin Context.sol

I’m trying to import BaseRelayRecipient.sol in my contract and getting compile error (compiling in Remix):

“TypeError: Overriding function return types differ.”

Error is pointing to this part of my contract:

function _msgSender() internal override(Context, BaseRelayRecipient)

view returns (address payable) {
return BaseRelayRecipient._msgSender();

Error also states that the overridden function in Context.sol is:

function _msgSender() internal view virtual returns (address) {
    return msg.sender;

Any suggestions? Thanks!