refactor with connect
conflict