okay lets try a merge post-commit