merging local with github