Checking out registers page state from master, as this is clearly a symptom of a bad merge