Git version information will now be written to .FAAVlog and .formantlog files when git is available.
merge conflict resolution