File for conflict added