now merge fixed