resolve 1 problem
resolve conflict
restore the deleted file