delete review & resources
resolve conflict