finish incomplete merge