first commit on local machine
merge previous changes with version from local machine