Fix merging conflicts
Signed-off-by: Paul Beeler <sparksco@gmail.com>