Move code block that was misplaced during merge