manually resynch with some unmerged changes