.project file
Resolve conflict