Fix post-merge to do same ast post-commit