really fixed merge