fix merge conflicts
Signed-off-by: Jean Francis Dominique S. Mabalot <jmabalot@google.com>