upd afnetw
resolve conflict