Fix version number
Fix untracked false positive on unmerged files

References #440.