initial remote commit
merge with local version