Merged with local