changingsadswq post-merge checks