Example for nonconflicted merge