add conflicts
cleanup