merge with local