first commit for connectify
conflict resolved