clean up conflict