Whoops, I derped. This time they are properly merged