Fix post-merge problems.