Test fork merge