Merged local fork