move of code block to (hopefully) prevent merge conflict