Fixed the dodgy merge

Signed-off-by: Fraser Sharp <fraserrsharp@gmail.com>