clean up
resolve conflicts