Test fork and merge