Trivial merge rules

1 7�� 0�� 9�� 0�� ;�� 0��,=�l��i~�*eJq@;pM\�ţ� ��_�I|��M��?�= Trivial merge rules