merge fixed 2