add a problem
resolve conflict