Merge error

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>