merging local reposity with remote