merged my updates