merging the best of two local versions