Conflicted files dont show properly in source control view

[JohnstonCode]

• VSCode Version:1.18.1
• OS Version:Fedora 25
• Extension Version:1.3.2
• System Language:English

Steps to Reproduce:

1. Have a conflicted file in the repository.
2. Look at source control view
3. In changes, file is missing the conflicted icon
4. In not tracked the conflict files are shown

For example defaults.conf is missing icons in changes and in not tracked the following are listed.
defaults.conf.mine
defaults.conf.r1
defaults.conf.r5