fix incomplete merge