Cleaned up merge mess

Signed-off-by: A. van der Pluijm <info@urbanlink.nl>