Fix up git conflict map
Flag files for conflict diff as temp (or not if they already exist)