first commit
merging remote and local