Now that was an excellent automatic merge. NOT.