merged diff from scrutinizer