post-merge fixes #6