fixing Mark Wiebes merge conflict