Merge with latest local