changings post-merge checks