Fix remaining merge conflicts. Fix typo.

Signed-off-by: Matthew Heon <mheon@redhat.com>