Readme updates

Signed-off-by: Matt Woolley <matthew.woolley@nliven.com>
Fix conflict