FIXED  merge