Some whitespace cleanup
Clean up conflicts
Signed-off-by: Mark Reilly <mark@alienresident.net>