memset.S: remove merge conflicts

Signed-off-by: Jean Francis Dominique S. Mabalot <jfdsmabalot@redhat.com>