Second nonconflicted merge example