merge fixed