first commit project environment has been created
conflict resolved