Merged with remote