project file changes
resolve conflicts