Fixed merge conflicts.

Signed-off-by: Christian Gunderman <gundermanc@gmail.com>