running merge with Carlos version