Merged with a different version