Working , merge fixed