reset the project
resolve conflicts