Switched back from extend to merge