Added support for trackign root and merge commits