merge fixed (now finally)