try to deal with conflict
after