Oops shouldn't have skipped the last merge, now it works. Still slow.