Color coding for file conflicts