fix typo in my merge