about done
resolved condlict